Fix too many watcher instances issue #6026
+140
−34
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.